Clean-up checking for not-yet-supported functions