Remove old vars, update download function