Clean the code for those two items and the systems involved in them.