Cleanup in hardwall function.

Change-Id: I731fb8e46cd58625afe7ea9277a1bc9d7225651f