Remove old bits of code
Remove more old bits of code
Re-order fields in add new item