Remove embedding of classes

Change-Id: I803065b5ac9e4c7ddb84462922c0e4b3ba773613