Remove single use constants