Merge to remove branch

Cleanup on aisle four; revised collections and clubs.