cleanup for php > 5.3