Clean up some duplicate functionality from vanilla