removing a bunch of unused vars