improve and clean up GarbageCommandController