Cleanup. #2