Remove old layout references