Cleanup a few systemui java files