Cleaning up code to start working on new requisitions service