Moved shouldBeCleanedUp, get/setLayer to Thing