Tweaks to build file and removing some config options