Small packages cleanup