Removed layer/tweak stuff for reworking.