make it more general, remove my custom configuration as much as possible
remove deprecated option