More cleaning up and removing unnecessary controls