cleanups of hopefully unneeded stuff