Cleanup: AbstractEntity