#155: Add str to cleaup