I'm not confident about all the cleanup here, are you sure it works?