Cleanup - Removed logging and debug info