Clean up for merge to be possible (hopefully :) )