Remove some old pre-bundler code
fix conflicts from merge