Unneeded declarations taken out