a little cleanup of unused bits