Remove unused code
Fix demo CSS