Fix deprecations warnings

Plus removed a couple of unused gems