Remove redundant code.
Next working, prev commented out for now.
Renabled tests. Implement prev.