Removed some hard coded paths