Hardcode Dunderpatrullen and cleanup