Dunno. Some cleanup