Cleanup. Remove unused imports. Remove debug logging