Removed commented test code, little change in create.tpl template