Removing hard coded paths