Job, Jeff - refactered out missing, wastages and expiry methods