[#3840] Cleanup and documentation