Adding clean stage, removing unused stuff.