[cleanup] Applied codestyle
[cleanup] Removed ancient deprecated methods