Remove unused css, js
Merge remote-tracking branch 'origin/master'