removed now unneeded code (see prev. refactoring commit)