Remove cruft

Here are a few commits to do cleanup for extraneous things