I keep finding little things that need adjusting like replacing the RSS links automatically added to the header. Achieved with remove_action('wp_head','feed_links',2); and the same for 'feed_links_extra',3. Then manually updated header.php and we're done.