Clean up old code no longer used