Remove debug logs and cleanup