cut number of errors from 121 to 27 in Custard.php - so, file cleanup