removed unused imports.
defined targets for entities to reduce warnings.