Cleanup. #16