Clean-up

Remove cruft