Remove notice and todo
Add version