Some useless code has been removed