Code style changes, remove now-useless code