D-12940: removing extra spring beans, added null check on destroy