minor cleanups and remove start message