Clean up
WIP - Fighting with the TS modules presentation code