rest of clean up of ISplcieEntity interface