removed commented out parts of code