cleanup spec package
more cleanup