start removing constants