Code clean up related to security #6

We will let spring to handle other status code.