simplecard cleanups

Change-Id: I2564f1524b78307504f36cab73ae897724be6974