Clean up #126