Added some missing copyright information.

Change-Id: I12a67ebceebf4c7321a8bc052e009c0e1f9209d5
Removed obsolete methods (performance tweaks no longer make it necceserary).

Change-Id: I7b7217becc5f7179ed03ef997195d1d9073ce8ca