Cleaning

Primarly, stoped using old deprecated method