more cleanups from semarie