Remove some non-used variables