Remove unnecessary generator components