Removed commented out debug lines and unused code