Removed usertype references