[cleanup] Applied codestyle
[misc] Commented out code that never works