All entities moved into templates
Removed unecessary line