Remove implemented with tests. getNext and getPrevious are broken now becausr of current wrong