Update comments and clean unused stuff