remove condition statement, remove validation