Cleanup and Oculus DK 2