Remove debug

Removing debug and cleanup of unused imports