Cleanup

Remove duplication and rely on percentage assignment to switch features on/off instead of accessing the Redis hash directly.