Component sub generator cleanup