removing hardcode params