Remove more code. Preparing for complete rewrite.