More code clean up.