Fix loading of current Predef

Fixes:
- Loading of current predef.
- Removal of unneeded code.