removed temporary controller etc.