Remove some TODO in the main class.