fix tab display
remove unused statements
Merge remote-tracking branch 'origin/master' into Midnight-coding