delete resolved TODO.
convert layer type to underscore.