Cleaned up demo stuff