After cleaning out cruft. This is NOT TESTED