Remove System.err and update header