Update package
Remove redundant package step
Remove obsolete package
Update TODOs