bugfix, even more cleanup :)