Removed redundant dep
moved transactional annotation
Only close em if open