Clean up stripped down-implementation.