Constants cleanup