Removed heap allocated classes