Fix draggable, remove cruft