c99-allowed cleanup