Unrelated to Mrnt's changes, just taking this opportunity to remove old code...