removing functions that should have been ripped in earlier commit