Clearing out some cruft