[cleanup] removed last deprecated method
[cleanup] imports, removed unused fields