Removing unused helpers
Fixing form