Functions.php cleanup

Cleanup functions.php.  Add in default page-template removal.