removed templates clutter