Cleaning up a bit

removed some un needed variables and functions.