Remove unused var and debug comment