Deleted more unneeded stuff