removed some more changes not needed in fork