clean up, hope this doesn't change anything important.