Restored old files
Removed bad #define