removed commented code blocks