Cleanup #109