Remove definition of embedded classes