lchen59 kwchen3 cleaned up packages