constants cleanup