Rewrote ObjectContainer and layer handling for clearing objects