Update features, break out deactivate into own feature file