Changes for LTE signal bars (hopefully) and cleanup