Further clean up after restructing