cleaning up some things;