Remove unused code that was never used or was kept by mistake.
This will create a new commit in order to revert the existing changes.
