New packages; clean up all over