Removed null-cited bugs