Some cleaning up