removed commented calls