refactor, remove unneeded 'bridge' functions
minor