some changes
deleted old templates