Got rid and changed some stuff