Get rid of collector code (will b e developed as separate package).