Clean up user validation declarations