Removed some defined statements