perform a proper oculus teardown if it isn't present
Merge pull request #1543 from birarda/master

perform a proper oculus teardown if it isn't present