Remove reliance on Numpy
Remove outdated comment