Fix infinite loop in AbstractEntity + cleanup

- Fix possible infinite loop in AbstractEntity.set__Type 
- Remove non existing property from properties files