soem cleanup to api core handling