Still removing hardcoding