minor cleanup, swapped in CoreAnimation layer