Should now clean properly after build