Cleaning more oops