Remove some non-needed variables