Cleanup

Make sure removal is also reflected in the documentation