Removed class config, added define service