cleanups to support development