improved cli cleaner registration