Marked unused stuff as deprecated