Refactoring

Clean up unused variables