continuing to remove jquery, cleanup javascript