Removing now outdated commented code