HIP-1113 cleaning up