Cleanup of functions.php