Remove group-user drowndown enhancements from branch