Codegen tweaks - removed Telephony