Bug fixes

- No more Abe code
- More clean jp