Remove unused code
Fix old demo CSS