add some comments and remove stale code