Removed some cruft left in by the most recent merge from feature/collections.