Probably the last commiton this project, just delete some useless things and correct a bug