Additional simplification of API. Removed rarely used interfaces.