removed some more unused code. Updated functionality of current point.