Drop monkey patches that are no longer required