Removes deprecated methods in light of version 2.0
Code adjustments, mainly thanks to rubocop.