Core: Remove some unused variables