Remove 2.0 and 3.0 bootstrapper package info
Correct a TODO