clean up codes
remove IDataFromMyAPI.java
update from upstream
update