Updated to the latest changes in the specs of Enumeration and Control
Ersased unecesary file