More cleanup, citizen doesn't depend on GCD now either 😄