Another clean up...