Remove unused function
Refactored validation of new input in to its own function