Removing old Entity.java