Linux cleanup removed for now