diff --git a/LICENSE_1_0.txt b/LICENSE_1_0.txt
deleted file mode 100644
index 36b7cd9..0000000
--- a/LICENSE_1_0.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/example.cpp b/example.cpp
index bbdca21..bd88056 100644
--- a/example.cpp
+++ b/example.cpp
@@ -72,11 +72,6 @@ signed main() {
   print(tuple{unordered_map<int, string>{{3,"three"},{1,"one"}}});
   print(unordered_set<int>{3,1,4});
 
-  print_no_space("Case #", 0, ": ");
-  print_no_space(42);
-  print_no_space();
-  print();
-
   redirect_input("example.in");
   print("reading from example.in:", read_string());
   redirect_input("example.in");
diff --git a/include/bits/include-all.hpp b/include/bits/include-all.hpp
index 3cb5911..86d5c1d 100644
--- a/include/bits/include-all.hpp
+++ b/include/bits/include-all.hpp
@@ -1,7 +1,3 @@
-//          Copyright Johannes Kapfhammer 2019-2022.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 #include <algorithm>
 #include <array>
 #include <bitset>
diff --git a/include/bits/prettyprint.hpp b/include/bits/prettyprint.hpp
index 4a78cad..1a27b45 100644
--- a/include/bits/prettyprint.hpp
+++ b/include/bits/prettyprint.hpp
@@ -7,8 +7,8 @@
 //
 // The global operator<< overload hs been removed
 
-#ifndef SOI_HEADER_PRETTY_PRINT
-#define SOI_HEADER_PRETTY_PRINT
+#ifndef SOI_PRETTY_PRINT
+#define SOI_PRETTY_PRINT
 
 #include <cstddef>
 #include <iterator>
@@ -493,4 +493,4 @@ pretty_print(std::basic_ostream<TChar, TCharTraits> &stream,
 
 } // namespace soi
 
-#endif // SOI_HEADER_PRETTY_PRETTY_PRINT
+#endif // SOI_PRETTY_PRETTY_PRINT
diff --git a/include/bits/soi-dbg.hpp b/include/bits/soi-dbg.hpp
index 15227d4..b116e42 100644
--- a/include/bits/soi-dbg.hpp
+++ b/include/bits/soi-dbg.hpp
@@ -1,4 +1,4 @@
-//          Copyright Johannes Kapfhammer 2019-2022.
+//          Copyright Johannes Kapfhammer 2019.
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
@@ -7,8 +7,8 @@
 // initialize with dbg_init() to enable colorized output
 //
 
-#ifndef SOI_HEADER_DBG
-#define SOI_HEADER_DBG
+#ifndef SOI_DBG
+#define SOI_DBG
 
 #include <cstddef>
 #include <cstring>
@@ -239,4 +239,4 @@ template <typename T> T &&identity(T &&t) { return std::forward<T>(t); }
 #define dbg(...) SOI_DBG_IMPL(SOI_IS_NONEMPTY(__VA_ARGS__), __VA_ARGS__)
 #endif
 
-#endif // SOI_HEADER_DBG
+#endif // SOI_DBG
diff --git a/include/bits/soi-deprecate.hpp b/include/bits/soi-deprecate.hpp
index cfe8a9e..f87dddf 100644
--- a/include/bits/soi-deprecate.hpp
+++ b/include/bits/soi-deprecate.hpp
@@ -1,10 +1,3 @@
-//          Copyright Johannes Kapfhammer 2019-2022.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-#ifndef SOI_HEADER_DEPRECATE
-#define SOI_HEADER_DEPRECATE
-
 #pragma GCC diagnostic error "-Wdeprecated-declarations"
 
 struct endl_is_evil_t {
@@ -89,5 +82,3 @@ free(void *ptr, std::size_t new_size);
 //operator new(std::size_t sz);
 //[[deprecated("delete is evil.  Use a vector.")]] void
 //operator delete(void *ptr) noexcept;
-
-#endif // SOI_HEADER_DEPRECATE
diff --git a/include/bits/soi-io.hpp b/include/bits/soi-io.hpp
index a596e09..14ba043 100644
--- a/include/bits/soi-io.hpp
+++ b/include/bits/soi-io.hpp
@@ -1,10 +1,3 @@
-//          Copyright Johannes Kapfhammer 2019-2022.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-#ifndef SOI_HEADER_IO
-#define SOI_HEADER_IO
-
 #include <iostream>
 #include <cassert>
 #include <vector>
@@ -96,11 +89,3 @@ void print(Arg&& arg, Args&&... args) {
 void print() {
   std::cout << '\n';
 }
-
-template <typename... Args>
-void print_no_space(Args&&... args) {
-  using expander = bool[];
-  (void)expander{0, (soi::io::print(std::cout, std::forward<Args>(args)), false)...};
-}
-
-#endif // SOI_HEADER_IO
diff --git a/include/bits/soi-pretty.hpp b/include/bits/soi-pretty.hpp
index c495e69..bc304a4 100644
--- a/include/bits/soi-pretty.hpp
+++ b/include/bits/soi-pretty.hpp
@@ -1,10 +1,11 @@
-//          Copyright Johannes Kapfhammer 2019-2022.
+//          Copyright Johannes Kapfhammer 2019.
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 // pretty pretty_printing with c++
 //
+
 #ifndef SOI_PRETTY
 #define SOI_PRETTY
 
diff --git a/include/bits/soi-redirect.hpp b/include/bits/soi-redirect.hpp
index 95b5059..93a7b95 100644
--- a/include/bits/soi-redirect.hpp
+++ b/include/bits/soi-redirect.hpp
@@ -1,10 +1,3 @@
-//          Copyright Johannes Kapfhammer 2019-2022.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-#ifndef SOI_HEADER_REDIRECT
-#define SOI_HEADER_REDIRECT
-
 #include <ostream>
 #include <streambuf>
 
@@ -98,4 +91,3 @@ void redirect_input(const char *filename) {
 void redirect_input(std::string const &filename) {
   redirect_input(filename.c_str());
 }
-#endif // SOI_HEADER_REDIRECT
diff --git a/include/soi b/include/soi
index d959663..2589d6a 100644
--- a/include/soi
+++ b/include/soi
@@ -1,11 +1,9 @@
 // -*- c++ -*-
-//          Copyright Johannes Kapfhammer 2019-2022.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef SOI_HEADER_INCLUDED
-#define SOI_HEADER_INCLUDED
+/*
+   Students: please don't try to understand the details of headers just
+   yet.  All will be explained.  This header is primarily used so that you don't
+   have to understand every concept all at once.
+*/
 
 #include "bits/include-all.hpp"
 
@@ -90,5 +88,3 @@ using soi::interactive_task;
 
 #define int int64_t
 using namespace std;
-
-#endif // SOI_HEADER_INCLUDED