cleaned up some code and deleted unused files

removed previous variable declarations no longer being used or no
longer needed