Removed todos (not worth it)