Got rid of some code that isn't necessary in the demo version of 5.1