Cleaned up demo to remove unused functionality