Remove from/import and update to PHP5.4