Release cleanup take 2