Refactored code to remove donor status functionality(#197)

see #197