more cubemap cruft cleanup