Cleaned up in demos