Removed unused variables (insight #16)