cleanup of deadcode