Clean up agains Virtual Reality Code