Removed extra templates