Remove use of $subType as well