Finish removing build stuff for now