Clean up

also testing integrations with * everything *  :rainbow: