Stupidity removal cleanup