Restore cleanup fuckedup things