Some customization and package cleaning