Removed unused and redundant code/cfg
Removed unused and redundant code/cfg