Uses flatinator to build now, plus cleanup