Remove unused vars and methods and some fixs