Neaten up cleanup a little. Don't remove red bars.