Removing client lib from data, adding comments