removed commented out code to clean up