RF-13582: remove duplicate classes