Merge "OPP: Remove dead code and update Constants.java"