Remove scripts and a huge update to builder