Comments and deleted useless class