Some more cleaning up...