removed useless junk
converted to typescipt