KMS-4431 MR review removed unnecessary files