Cleanup, preparation to pull

More closely match Tehshrikes repo