Remove stuff that's now in the plugin