Remove commented code
Update gems