Interrim cleanup