Minor updates, removing the old FULL calculation in memory