tidy up deprecated methods