Clean up some requirement crust
Merge pull request #379 from steventlamb/topic/ops

Clean up some requirement crust