Adding comments and removing unused things.