- Remove hardcode