Cleaning up a few things & removing unused templates :boom: