Removing a lot of hard coded paths/configs