Removing last hard codes values