Removed left over bits of --memory option

Change-Id: I62accc42d60e22cd8cf5ff4c411d43085c4fe703
Merge "Removed left over bits of --memory option"