LPS-51215 Removes no needed classes