added cleanup & delete to maintanance

Change-Id: I4125479171f6f1b3629a8ad98105ff891b68e163