Even more clean up