took out unneeded stuff