Removed useless TODO item and cleanup.