removed unneeded stuff