LPS-44704 Remove left over unused classes from LPS-33761