Cleanup on unused variables