Changes to build to remove conf