Code clean-up + proper framework support for droppers