functions.php cleanup