Simplify constants and remove revision from wiki