Some cleanups

NOTE TO SELF: Clean up the includes next. They’re a mess.