BHV-9937: Removing unnecessary files