TODO: remove completed 'refactor bike import mess' item