Removed all remnants of the old layout system.