Remove no longer used task interfaces.
Add @FunctionalInterface to the functional interfaces.