Reformat code and delete commented code.
Remove unused method.