Added TODO to removed unwanted constants