nyalldawson May 30, 2016

Collaborator

@manisandro yep - pull them out and remove this class too.