Leftover changes made in preparation for data club on 05-09-2013.