I agree, no one should complain if commented out code gets removed at some point and you can look up old code in git.
@alexyosifov could you please have a look at the commented out code and remove the unnecessary functions or add TODOs, as @henningw suggested?