cleanup regarding the removal of pkg.gypi