Add build file, roll back some functionality to facilitate build