Clean up

removed unnecessary vars