minor stuff
getting rid of cruft