Yet more

A quick few changes to names and remove unneeded code.