Remove old code, add a few more comments