Remove hardcoding