More cleaning

Just clearing the cruft