Some cleaning up..