more cleanup, working on importing white list