Remove Extra Services

Remove services not needed for HKA