Finishing simplification changes