Removed hardcoded path reference
Removed old unused code