Add missing package, cleanup