Refactor make compatible

No strong reason to check in commented code here?