Commented-out code should be removed (can cause confusion in the future, if the reason for the out-commenting is unclear. The version control system preserves the old code, in case if it's needed.)