Added removal of prefill