removed unnecessary phases and functions which are now handled directly by the generi...