small cleanup of unused code from v1.0