More clean up…to be continued later