Sam

Getting rid of a lot of unused stuff