Cleanup. #81