Removed demo app stuff