Remove embedding of API class