Removed deprecated code about functional units and views