fixed #853 and removed unused gems