Improved routing calculation: removed utility which was duplicated in a worse form as it was using atan instead of atan2.