remove some spring custom code / update howto & patch