Removed some more code that is also in ROX-Lib.