remove usage of deprecated method
fix deprecated methods