Westwood TCPC cleanups