Clean up of the module to remove old 'nicer' classes