Removed commented cruft
Drop zone improvement