Removed commented code blocks