Core is compilable
Cleaning continued