small cleanups

- small cleanups
- remove dep on ejb3