remove account_code and activity_code as non generic