removed unused, fixed bug with drag/drop