Fixed error.
Fixed problem.
Refactored validation.
Refactored the validation and fixed the pre-remove.