Fix terminal to comply with store/unaligned_store returning void
Removing more unneeded memory include