Started cleanup of the WebAPI layer