cleanup, bugfix