Fixed up and removed unnecessary things