Code Tidy

-generally removed unused import, deprecated comments
-modified comments, reduced console spam

TransferWaypoint:
-minor changes to label positions