Removed all javax that was wrongly marked as private api