fp/add: Removed deprecated code and added construction comments