code review changes
removing claims module (claims is moved to account-management module)