removing obsolete validation, race conditions