remove again rargh
cleaned up stuff