Tidy up unused methods