Cleanup change: Removed unnecessary commented code, prints, dead code
etc