Update few deprecated methods. Imports cleanup