scam merge

scam cleanup