Code reformatting; removal of deprecated code no longer in use.