cleanup of deprecated stuff