Removing some extra cruft