Used undelegate method to prevent multiple submissions
Merge fix for duplicating submissions from branch 'master' into location_availability