Shortened js and removed more useless things