lots of cleaning up