Clean up - use existing logger, remove unused imports