Status bar fix and clean up unused code