More clean up to AFileDrop