clean up some un used variables and methods