Clean configuration

@howech