small cleanup of unused functions