Removed OS output; general output cleanup