more code cleaning, changed spring-security