cleaning up as i attempt to make spring social and Spring Security work together.