removed all this stuff