Remove buggy Layout algorithm optimization