Minor fixes

Removed variables that are never used.