Cleaning up templates - STILL NOT USABLE