Fix marker derp

Change-Id: I662d45262b22d245d1f22c1ba8a07467aee92024
Fix Build: delete unused files

Change-Id: Ibaf1553219baec7e936a4736a053286085ac83bb
Remove unneeded function

Change-Id: I71741165d4683c994c52b1b68b9823c29c8b88e7