remove scanning stuff from master