Removed inclusion of constants