Remove cruft
Various fixes