Removing properties from updateState (decouple layers from state)