Updated docs; pruned some old code