Took away unneeded stuff