remove constants #594
remove constants #594