Cleanup even more; Avoid specific NumPy API