Corrections and deleting unused methods