removed usage of deprecated methods