Remove some stalle code
Hook up highlight vs pushup