Further cleaning up. The monkey_patch is getting a bit out of control.