Removing some cruft