Remove all code about validation -> new file for it