remove the EB references, since they are invalid now
move bind to separate template