Remove some un-used variables