Finish Removing Custom layout