comments/remove constants