GOT RID OF some js