Finally! I managed to get remove working completely. Yay! Was a control flow problem.