Cleanup deprecated functions