Cleanup of old Code