Deprecated memory and included rework