remove various deprecated functions
remove deprecated functions
fix minor warnings