Clean up package and reference files
Get ready for NPS commit