Fixed issue: Cleanup action_delete
Fixed issue: Fixed validation messages