Mostly just cleanup, removed plugs that were slow