Clean up after many changes!!