Remove some extra cruft