Minor clean of prepare()
All packages cleaned up as per TU recommendations.