MISC: Remove cruft