more comments and cleanup, delete unnecessary models