Continue removing code / hardcoding.