get rid of some javascript, fix loading issues