Clean up of initializers and configurators