DF Removed unnecessary code.