More cleanup of drag n drop