Bug Fix - DIR Path
Removed old code