Code clean up, removed unused templates