removed old-dirty-code