Remove unused print statement + cleanup