added ability to remove fields / removed unneccessary placeholders