removed discrete points when doing over-segmentation
removed some superfluous header files