Remove some unused code and enable coding style
This will create a new commit in order to revert the existing changes.