removed commented out blocks of code