Remove commented code.
Remove unused definition.
Resolve #18.