Remove unused code
Merge remote-tracking branch 'upstream/master'
Always show current buffer in list