cleanup code
Remove ParentAware: It's not needed