Page template cleanup