I have no idea what I fixed there

Change-Id: I3535cf8af8e391bfaac2fadbf305be6feb94e57d
add headers, del unused .java

Change-Id: Ia39d8b0f764693b1e263132def18a54c7e6a8f71