removed old argument return
removed pointless bind
move bundling to client