closes #142 and other accidents waiting to happen by removing a couple of superfluous controls