Cleanup boost optionals