Remove console logs; clean up