Refactoring out Drop Validation