Clean-up here and there