cleanup of constants