Minor refactor of the status bar
Remove some unused files