Clean up the crap, and move Take2 to primary