Rewrite some files, cleanups