integrating whitelisting pipeline

issues with backward compatibility partly implemented
logging removed because not used