Cleanup TODO's
FindBugs: Fix some issues that FindBugs alarmed