Remove unnecessary lookups to user and profile_type data