Cleanup

Conflicts:
	default.xml
Cleanup, Take 2