Clean up for php 5.5