Add settings for new functionality and clean up existing config, and deactivate logic