Remove lots of unused stuff