Clean up .. sort of ..