more freakin cleanup: