Removed redundant initialization of entities