remove more onclicks nearly all done