Clean up for only cwm