Remove methods before re-defining them

This prevents ruby from dumping a ton of "method redefined" warnings to the console.
Merge branch 'patch-1'

* patch-1:
  Remove methods before re-defining them