Some cleaning up done.