Removed unused embedded classes