Removed expensive test code
Added a preprocessor to disable bubble merging to
prevent self-overlapping bubbles