Remove hardcode