Tidy up unused declarations