Just removed commented out code and commented out debugging outputs