Remove debug logging and optimize imports