removed some outdated commented code