simplyfying the drop thingy, cleanup