Functions.php cleanup