Internal API security

plus some clean up of spring xml files