Update to new scripts from @holman
Remove stuff I never use