removed all that stuff that never gets used