Removing old stuff
Improved distance feature and extraction