remove unnecessary include, add replacement setters for collections