Removing unneeded EntityBase; Entity is now the super class