Removal of unsed controls. Added more templates.