Removed old testing and error checking features