removed extra templates