regex fix
removed
more code