Adding form swap cleanup task

Change-Id: I0677fa9e280935368590f725e62a419a80d90d7a