Removing unnecessary import.
Manifest cleanup, removing unused service.