Cleaning up further...