spaces cleanup