Remove jQuery and clean up markup