Please try to avoid leaving old commented code independently of anything. Just leave some "TODO" comments if you really need to.