Added code validation.
Added recreating of scan activity.
Removed unused file.