cleanup, fix for fast-typing bug