Cleanup, will be easier later.