removed complete / unneeded stuff