Better cleanUp/init relation