hrm... remove some stuff