Clean up to remove unrequired parts

See previous commit for where all the old asserts etc were.