Sucks that we need to add a cleaner for something **new** out of the API