Fixing validation, removing unnecessary stuff.