removed a few deprecated functions and methods