Cleanup!

Yet again.