Discard bad js, some less tweaking