Cleaned up old demo