Additional cleaning up