Cleanup. #22