remove nasdaq and simplify