clean up everything.
Merge branch 'aaa'

Conflicts:
	GM/Makefile