- fixed: removed old code fragments