stright shot
clean old code