2.3.1; clean-up; removed author due to complications. \nauthor should be put back in when spring security comes into the picture