Some more cleaning up