some formatting cleanups, removing some unused code