* remove usage of deprecated methods