Removed commented lines and removed some warnings