Remove form, soon to add edit controls