removed all rests of numpy
merge