Remove useless part of the codes, former comments used for debugging