Style fixes and old code removal.