Cleanup: Removed unneeded "isContainer", ...