Code cleanup
Add Java ME as a dependency