small cleanup of unused code