another clean up attempt