cleanup. fixes #4