Clean up

.Old code removed.