Some Minor Fixes

Removed unused variables and include.