much cleaning up of things