Enable fullscan and cleanup (by grigorig)

Change-Id: I7c50798ff297411d7cb57676838228d93bcf88c9