Demo cleaned up