Remove hard coded package type