Cleanup. Remove unused debug-statements and imports