removed doctrine, preparing for new one