Remove files and mark as obsolete

Change-Id: I0a0e68ef12353837c635918ba89f1cb0d7d3657b