Cleanup and boostrap 2 to 3