clean up further