Removed extra templates and files