Get rid of unused Autocomment code

Change-Id: I28b6ade785c7bad3ad63eedb210b397b18b9bf73