Removed a lot of the i/o