Remove use of CustomC & friends