Cleanup
Make it compilable again.

Need to solve other issues first