cleaned all the unnecessary codes