merge updates to functions.php, removing teh filter removal code