cleanup

Conflicts:
	fuji.mk
cleanup