clean up....!

Conflicts:
	default.xml
fuck a duck