style cleanup/removal of old code