Removing layer refresh TODOs