clean-up and fiexs for vacuum