Remove extra code, simplify logic

Except for Entity.java, I'll have to do that class manually.