removed all sql from bundle and finish tags in switchboard