started constants clean up