Remove commented code
Fix bug