Fix Gems and removed commented code