DD : Removed some redundant code