Comemnted out debug code
Commented more code