tidy up from ages ago
rebuild with less stuff
Merge branch 'rebuild'