cleanup
Configurables base class added