funkydude:
	- More cleanups.
