Remove unused classes. Safer input value doc reading