Remove service imports and clean up