Resolved issue with cleaning old files

Change-Id: Iaece6118989104f3efbd8b07c5f8073f61edb00d