lots of dead code cleanup, as well as some formatting and fix of radius calcs