Removed unnecessary compiler directives and code