Remove needless constants and method