Clean up part deux

P.M. Sent