Removing unnecessary code and adding retro-compatibility.