Unnecessary modules removed plus name validation working