DATAREST-219: Remove old, commented out code