Remove Unused Variables from Mantis Core