throttles refactor/cleanup