a good clean up of all EtaObjects. Bug fix in EtaLocation.