Removed unused form file
Merge branch '18coffees-dev' into 18coffees-master