Remove some unused Java files
Add some common modification on framework layer