removing deprecated function usages
removing deprecated function usages