Cleaning up base template