RESTWS-322: Cleaned up