More OS specific cleaning