Removing hard coded path