Removed default object dependencies and ObjectManagerAware flag as they are not needed any more.