more static constants clean up