Name popup form cleanup