removed commented out code blocks