Drag&Drop cleanup

A little cleanup of the drag&drop extension