Minor changes for the jQuery removal