Cleanup v2

Sorry for that ...