Move specific pieces of logic still in use next to the individual parts of the code that use them, and eliminate base from the code.