merge planetary branch, remove extraneous js files