removed almost all references to old feature store manager