Made deleted unused files and methods, and made some changes